Fixed layout files so that they don't crash