finish render and themeing, need to add a few more things