Replaced table with buttons, some functionality