Improved design and added validation to entries