Some cleanup throw layout and UI things