styles cleanup
layout fixes