Add some sort of layout niceness