GUI bugs fixed