tons of cleanup from last night, better design direction still not responsive