Staging - GUI fixes for upstream

Trivial changes, ported from Freicoin