Added buttons and timer labels