Bug fix for ViewStack and cleanup of unused imports