refactoring layouts, adding includes and organizing posts