GUI added and some changes on the core