v 1.1-01 updt layout and add setings