Further changes to controllers, views and misc.