Layout cleanup & basic homepage with tests