Updated form for better usability