Fix table selection and button placements
Fix for real