improved UI & fixed modal