Refactor box and btn