Made the categories configurable and added space for comments.