Swardu

**What kind of change does this PR introduce?** (check at least one) - [X] Bugfix - [ ] Feature - [ ] Code style update - [ ] Refactor -...

**Select your issue type:** (check at least one) - [ ] Bug - [ ] Question - [X] Suggestion - [ ] Other (please describe): **Describe your issue:** Improved UI...