Changed UI, fixed a couple of small bugs