Most sizes are now referenced to the screen size instead of hard coded
merge