removed some code from controllers
forgot to save this one
home button merge issue
removed more json files
merge