Added scaffolding for values/actions, cleaned up html