Possible Final UI design

Fix several UI bugs &
Possibly the final UI design