changes on ui, forms and added button tags