added/changed some styling. subclassed some controllers