Some Changes for GUI