Presentation fixes and improvements