Refactor & add menu.group borders