Several template and bug fixes, some minor view behavior changes