Changes for using tiles for the application