-Added more buttons to Numpad
-UI changes for color/margins/buttons