bug fix for render table
ui fixes, adding remove for generic resources
Merge branch 'dev' into sandbox-jm