1. Fixed notifications width and positions
2. Add folders to instances list
Merge remote-tracking branch 'origin/develop' into develop