btnExpand solved and btnClose added