small changes and matchscreen layout better