Made cleaner structure without Foundation