Fix Presentation issues