Feature/ug pg consistency [ok to merge]

Just adding this branch in for various UI consistency tweaks etc. Might as well merge when we're happy we've ironed out any of the last few issues (if any)