Optional Design Changes

made a few changes… can easily change back