css changes
Edited main page
Merge branch 'dev'