cleanup
seperated input box and label