Issue: #444 - Modifying documentations and UI