Reworked assignments tab layouts