Refactor box and btn (2)