Updated markup,scss and js files