Layout fixes, text adding, refactoring and renaming to convention.