NEW refactoring of the layout, added logo