Small upgrade / css fixes