Fix custom buttons and few modifications