Code consistency - import menu block partial
Ensure menu block is working accordingly
Seperate out shame code'
Use tag class instead of removed flag class - same result
Consistent is-active classes
Inline list modifiers
Seperate layout and navigation code + rename them appropriately