Overhaul

Complete revision. Removed bootstrap.
Overhaul-improved