Cleaning up in order to introduce portfolio.

Maintenance work in order to build Portfolio page.