nix unfinish work
nix update
fixed scrolling button dissapearing
resolved merge conflict