reorganize css and prepare to design for larger screens