[TASK] Layout fixed / borders removed