Layout changes and options table