Linear check added + small UI fixes