Added toolbar and button options and setting MacOSX
Additional controls added