Add home button, improve file structure and fix bugs