Rev 0.0.2 Added buttons management