cleaned up more code and added user page