Remove data type field, consolidate some views, and some styling