Clean up code and add auto scroll to top

all controllers must start on new line for easy visual identification