Added more links and better username handling