Move stuff around, misc styling