Changed controller structure + ui fixes