made further mod on layout