small layout improvements, ready for beta