Doc update, ui update and more

Minor improvements