changed settings and homepage view
merging