updates to controllers and view layouts