Corrected missing imports and bad HTML on layout