Update desgin & more