move new button to end
make pretty