done #245, #248 @1h32m
build
update z-index refs #245 @21m
build
adding test buttons
build