some changes for better gui