FE updates & template changes
Merge remote-tracking branch 'origin/develop-ui' into develop-ui