Add m_currentBuferId
Add some icons