A start of something pretty
more pretty stuff
Prep for features view
Merge branch 'feature/prettyify_client_side_rebased_v_3' into develop