Last changes to controller/views before merge