ticket:3 fixed styling
ticket:3 Merge branch 't3_edit_information'