Updated

New UI and everything