Some minor changes to layouts
Change some string values
Remove unnecessary units
Correct string value