updated to include sidebar