Added: small ui tweaks