Add basic layout and tables