Lots and lots of controller action. Also some slight layout adjustments