Updated features, polished UI