Reduced database code, updated UI