Adjustments made after tests with new GUI