Fix modal btns and redesign all form no displays