Added Safe Area support