Fix for issue 54, fixed text for Today button. Refactored some code