Added the selection boxes and some layout solved