FIX: moved items from navigation to sidebar