messed around with layouts, improved UX a little