Added tab and better ui