More organizing and some css