Reverted small layout changes