Minor usability tweaks.
More usability tweaks for the client.