Portfolio2.0

further updates and bug fixes soon ..