Allignment issue fixed and validation added to the Setting Screen