fixed null error on all points, layout changes, added avatar, helpers...