Converted some forms to be non-ugly