Added two components to GUI - not yet merged with main