added options and cleaned up form render