Wrapped up basic home page. Now on to search results...
Merge fix.