Fixing lazy loading problem
Merge with UI stuff