UI Changes, moved things to controllers