Layout fixed for old users