Removed doc comments, fixed minor issue on Toolbar