fixed height & refactoring