Merge "Update template menu UI"