change seconds
change styles
Merge branch 'oconne'
team responsive fixes;