Adaptations to uic 0.16.6 and new template layout