Few last GUI bugs