Fixed Toggle issues and added popup comments button [axof: 218]