Fixed some inconsistencies in GUI code

See commit message