Added Portfolio and slight updates to MainAMSS