Added padding to tile text
Removed old TODOs