Fixed issues with the presentation