Removed unused code, added homepage code