some small layout changes
cleanup old akka stuff