Minor UI tweaks
Refactoring
Refactoring