Code cleanup
Added C-Buttons