Spring Cleaning && GUI rehaul