implement design review feedback batch 3

-fixed btnModal losing active class with animation
-moved discussions as right side panel