Re-factored layout / Fixed tabs and dots