added more forms and buttons