Feature/rapid entry fix merge

Moving rapid data entry mockup on new branch, fixing errors and adding fixing appearance of reset form message.