Inline view, refactors, updates