Issue #4: Hide the presentation default controls and clean the code