Simplified code; fixed blur/shadow in some cases