Some random button fixes
Added support for tables