Front end bugs, added data selectors