Removed comment out, Used html layout