added caption at top and such
added some custom fields