Fix Window resize functions
Fix Window resize functions
Merge branch 'dropdown'