Feature/49 redesign

pure awesomeness 2.0 (redesign)