Made selectors less specific
Added comments for submission