Refactor topbarlayout modifier