Removed templates
Better styling for tables