progress on styling
Merge branch 'bootstrap-3.0'
more development