Implementing feature #21. Refactored style and layout, first try
Implementing feature #21. Deleted unused files
Implementing feature #21, refactored style of layout
Merge branch 'feature-21' into develop