CSS Update, controller fixes