Added a lot of the missing UI