Minor changes to metro template