Layout & typography cleaned up & simplified