Easier layout, and a bunch of other things