major changes to UI