Fixed setup page css
Changes made to setup page
Merge branch 'issue-39' into develop