Merged duplicated code
Minor cleanup in the GUI for lower resolution phones