Code updated, GUI added