Clean-up how fields are defined (descriptions vs desc and subtitle vs sub_desc). Also added border field.