Added and reformatted preferences and OS X Keybindings