layout cleanup and bolding borders