Improved tables, to keep table style consistent