Added tile buttons and did some renaming