#742 Styles have been improved to work better with responsive design
#742 Remove duplicate code