decimal bug, layout fixed