Made method more safe
Polished UI