Add name to bases
Fix bonus handling
Integrate bonses to web interface
Cleanup
Nicer layout