Removed Lazy Loading for now, Fixing layouts