GUI bug fixses