Visual cleanup for demo

Also fixed null pointer exception in menu tree.