fix bugs and ui polish for finals demo