cleaned up new and index views