Added logs display
Merging conflicts resolved