Fixed table border and updated restrictions