UI logic added