added some change in gui and main