Added tabs and a basic layout