WIP: Adding retry to loading layout