removed br, cleaning up forms a bit