Default compact selection and Expanded tab issues resolved