Moved layout to bundle, using header and footer views