Added:
-TabbedPage and some margins