some refactoring and added also current jobroom layout