small refactoring + change to layout