UI Change

Changed the UI to be quite nicer. Still a WIP.