Readjust forms design and Calendar

not finished