Rearranged controllers and scss.
Various style and code improvements.