Improve table style & minor tweaks