further developement of the view. can now render skills and health
fixed merge problems