Some small upgrades and visual fixes