Adding more features to the GUI