Re-arranged sidebar and ids