Design Overhaul
Minor changes