Minor Fixes with correct saving.
Top button
and preview of links