changed look and fixed sticking error that ocurred during demo