Feat/add comment screen