tons of layoutand css cleanup