more tweaks + added tap to refresh