Made everthang nicer, and added user page injection