Added some improves for the gui