Final commit with hide/show feature