Removed hard coded references and did some GUI changes