Improve UI, add editing and confirm approve