admin ticketadded and some refactoring