Refactored UI
Merged changes in MainActivity