More little changes in preparation for new GUI