More layout tweaking to fit all phones. Fixed some naming errors