Fixed a few bugs in portfolio menu ordering