Finish demo bar

Other small fixes and additions