Add links and clean up form a little bit