Modified to fit framework, added header/footer