More GUI Fixes. From now on this is up to David to work on.