refactoring, layout changes