Fix issue#26 Homepage should match wireframes with caveat

@Osmose r? This should be merged last from my previous PRs as issues in here are fixed by the previous.