Adding "click to edit" and loading

Signed-off-by: Ronald Huereca <ronalfy@gmail.com>