Revised UI + Auto-generated files