Added dropdown TA and fixed bugs