rearrange server inits
cleanup code, add buttons for drawings