template UI ticket fixes