Fixes for onepage gui