Updated ui

it's a mess right now, starting to tidy it up a bit.