Cleanup of code and files, fixed toggle label routine