Update demo and menu spacing issues