Added Ui to comments
#TODO Refactor comment to include template as this is duplicate code