basic code cleanup, extra classes removed, fixed drawer highlight button to be centered during demo