fix layout after refactoring