Made Mac buttons the same layout as Windows ones
Removed dead code