GUI changes and updates