Template structure improvement. Bootstrap override file. Clean up.