Fixes for option table working and display