Updated code and design, location of assets and files