Fixed single and index view, removed extra header junk