Fixed Mac OS X UI issues

Fixed Mac OS X UI issues