Overall update to the UI, added validation