Minor changes to the code and GUI