CSS additions, unit tests, controller updates