Some small tweaks and a small screen tags update