Constants to Globals and other clean up
Modified calendar button