Code cleanup
Code cleanup (2)
Small string fixes
Update layout to also support smaller screens
[FIX] Bad merge
Finish code cleaning