re-organized stylesheet