Tried to implkement more GUI functionality