Fixed concurrency issue, added layouts for smaller phones