Added tabbed view
Fixed tab layout