Major overhaul using themed Bootstrap