Minor GUI modifications and bug fixes