Solved some design issues
Made a couple of design changes