UI tweaking
[#15]