UI improvements
Added edit forms