Apple Mac OS X Update

* Update the UI on OS X so that it matches GNU/Linux and Windows
* The start of a couple bug fixes (the rest will follow)