Adding blanket coverage in the client side #18

additionally added improvements in the layout for #1