Back in line after merge
Added magic view and profile view