Fix dependencies in the Makefile
Fix layout
More code layout fixes
Fix the in the Makefile to properly remove the \bibliography command