Added basic translation strings, fixes to layout, using @layout to ensure that layout is properly structured