Updating components; Template tweaks