form fix and some design change