Styling changes and Controller Updates