Added more to profile view
Fixed some template bugs