code cleanup
work fix the value input lay out and fixes