Continued refactoring of Decode Sidebar