Some general changes and started an template index view