Merging project page back into main

Project page