UI tweaks + Refactoring...