Fixes ux problems. Adds new controllers