Update gui + small logick