Updated styles and added validation