Minor changes & updates for GUI