Some usability fixes after Levi's session