adding missing files
layout refactoring