Just some refactoring.
Added new layout