improved ui
improved ui forms