Reorganize storyboard & sidebar