[#55]Prepared for merging/UI tweaks

...