refactoring for responsiveness + changes to sidebar etc