Responsive edits and Validation fixes