Various UI improvements

1 job for master