Working UI, before removing the tab feature