Fixes from review, aside notes are changed, also slides layout and order is changed.