Revert "Revert "bug fixes + suggestion panel added""

This reverts commit 5c132b48c9ea32aaaa45355654a39ae7b09d7c5c.