added buttons, fixed forms