UI improvements, update edit page