refactoring layout
refactoring layout (missed some files)