Fix shimmering on basic modal in ff
Updates to layout from sidebar