Fixing final presentation bugs