adding controllers for all screens
solution file change
merging controller additions