Many little changes plus Edit Portfolios on Dashboard Portfolios
Fixed merge errors