updated with new theme, new index page and removed redundant code