cleanup and fix monthly selector