various layout changes
travis, breaking things