Added current screen hook
Added current screen hook