Repositioned and renamed toggle button, fixed broken import