overhaul - fixed sidebar issue