Add icon and solo sidebar. Fix bugs