Added comments functionality and basic design