Added back in various toolbar options and forms (Migrated from prev. version)