Major front-end UI code change! Bugs and dragons ahead.