improved button declarations
ui fixes, forms additions