Added tabs and general layout