Add formatting css and reorganize