Consolidate Desgin
Consolidated Desgin , Cleaning Up
Revert "Consolidated Desgin , Cleaning Up"

This reverts commit 5908ab89db8d8a203c6161c6e2efaa085341d955.
Merge branch 'master' of https://github.com/DCSGInterns/GUI