Updated to 1 page layout