Cleanup and improvements
Further slide cleanup