Condense and slightly clean up layout, fix double padding