Made some progress on a "cleaner" layout