Added comment capabilities and changed UI