more ui updates and plan for more modes