Added Tabs and put back onClick function