Introduced a comments tab on the application panel.
Fixed merge conflicts