Few fixes on GUI