Finishing Demo Site