Making separators have the same margins and fixing alignment issue