UI

Basic UI stuff done this afternoon