Hmm :\ a couple more layout fixes I missed