Removed superfluous comments and added red border for mandatory fields