Changed the way layout and scaling work in these so that it works more logically across different screen sizes