Fixing some design issues #975

Closed
RuaaGhali98 wants to merge 4 commits from roaa_redesign_labs into development