Added columns to index, improved look