portfolio page improvements
Fixed merge issues