Restructure, css cleanup

Bumping