Comments deleted, layout tweaked