Removed Homecontroller, removed some bugs