Updated with new basic layout page and theme