UI Changes for smaller screens, sdk update to 21