Added Entity selection and tabs