Final Build (Deleted commented code in layout files)